Auto merge of #1996 - aturon:cargo-features, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 22 Sep 2015 23:23:09 +0000 (23:23 +0000)
committerbors <bors@rust-lang.org>
Tue, 22 Sep 2015 23:23:09 +0000 (23:23 +0000)
When I was looking for this in the docs, it was a bit confusingly buried.

r? @alexcrichton


Trivial merge